Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 21 Jan 2010 08:59:11 +0000 (08:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 21 Jan 2010 08:59:11 +0000 (08:59 +0000)

Trivial merge